]> dgit.raspbian.org Git - gnome-shell.git/commitdiff
build: Set rpath on more executables
authorFlorian Müllner <fmuellner@gnome.org>
Thu, 12 May 2016 15:35:47 +0000 (17:35 +0200)
committerFlorian Müllner <fmuellner@gnome.org>
Thu, 12 May 2016 16:10:04 +0000 (18:10 +0200)
We need to point executables to our private cogl/clutter forks.
Commit 093fd54e2 did this for the main executable, but forgot
the extension-prefs tool and other helpers.

src/Makefile.am

index 76ad9f7f8e8bab3a6abb77dc53aa1853beb6fde3..e9aacfe0c42251b5963c09daa7121f2c98df3d42 100644 (file)
@@ -213,6 +213,7 @@ nodist_gnome_shell_extension_prefs_SOURCES = \
        $(NULL)
 gnome_shell_extension_prefs_CPPFLAGS = $(gnome_shell_cflags)
 gnome_shell_extension_prefs_LDADD = libgnome-shell-js.la $(GNOME_SHELL_LIBS)
+gnome_shell_extension_prefs_LDFLAGS = -rpath $(MUTTER_TYPELIB_DIR)
 
 if HAVE_NETWORKMANAGER
 
@@ -226,6 +227,7 @@ nodist_gnome_shell_portal_helper_SOURCES = \
        $(NULL)
 gnome_shell_portal_helper_CPPFLAGS = $(gnome_shell_cflags)
 gnome_shell_portal_helper_LDADD = libgnome-shell-js.la $(GNOME_SHELL_LIBS)
+gnome_shell_portal_helper_LDFLAGS = -rpath $(MUTTER_TYPELIB_DIR)
 
 endif
 
@@ -280,7 +282,7 @@ noinst_PROGRAMS += run-js-test
 
 run_js_test_CPPFLAGS = $(MUTTER_CFLAGS) $(gnome_shell_cflags)
 run_js_test_LDADD = libgnome-shell.la $(GNOME_SHELL_JS_LIBS) $(MUTTER_LIBS)
-run_js_test_LDFLAGS = -export-dynamic
+run_js_test_LDFLAGS = -export-dynamic -rpath $(MUTTER_TYPELIB_DIR)
 
 run_js_test_SOURCES =                  \
        run-js-test.c